Skip PRs merged with a merge commit#49
Open
Phlogistique wants to merge 1 commit into
Open
Conversation
The action triggers on any merged PR, but its merge sequence assumes the squash shape: SQUASH_COMMIT~ as "target just before the merge" and an -s ours record of the squash. A real merge commit satisfies neither - and needs no fixing at all, since history is not rewritten and stacked children keep correct diffs. Detect the second parent and bail out before touching anything. Rebase merges remain indistinguishable from squashes in the payload and are processed as before. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The action triggers on any merged PR, but its merge sequence assumes the squash shape:
SQUASH_COMMIT~as "target just before the merge" and an-s oursrecord of the squash. A real merge commit satisfies neither — and needs no fixing at all, since history isn't rewritten and stacked children keep correct diffs. Detect the second parent and bail out before touching anything; README note updated, new unit testtests/test_merge_commit_skip.shcovers it.Rebase merges remain indistinguishable from squashes in the payload and are processed as before.
Stacked on #45.
🤖 Generated with Claude Code
https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX
Generated by Claude Code